From: Florian Müllner Date: Mon, 21 Mar 2011 13:06:35 +0000 (+0100) Subject: run-dialog: Honor lockdown settings X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8578 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=291ef07cf3d6efd7c858fa1f956ede72464a523d;p=gnome-shell.git run-dialog: Honor lockdown settings org.gnome.desktop.lockdown has a setting to prevent the use of the Alt-F2 run dialog. Honor this setting. https://bugzilla.gnome.org/show_bug.cgi?id=645335 --- diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js index 15340d359..2a02a3b02 100644 --- a/js/ui/runDialog.js +++ b/js/ui/runDialog.js @@ -22,6 +22,9 @@ const MAX_FILE_DELETED_BEFORE_INVALID = 10; const HISTORY_KEY = 'command-history'; +const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown'; +const DISABLE_COMMAND_LINE_KEY = 'disable-command-line'; + const DIALOG_GROW_TIME = 0.1; function CommandCompleter() { @@ -167,6 +170,7 @@ __proto__: ModalDialog.ModalDialog.prototype, _init : function() { ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'run-dialog' }); + this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA }); global.settings.connect('changed::development-tools', Lang.bind(this, function () { this._enableInternalCommands = global.settings.get_boolean('development-tools'); })); @@ -353,6 +357,9 @@ __proto__: ModalDialog.ModalDialog.prototype, this._entryText.set_text(''); this._commandError = false; + if (this._lockdownSettings.get_boolean(DISABLE_COMMAND_LINE_KEY)) + return; + ModalDialog.ModalDialog.prototype.open.call(this); },